GtkFileChooser: don't override already opened folder

When filechooer is re-used (instead of being created and destroyed
every time it's needed), it might happen that the directory the
application wishes to initially show is the same directory that
was shown last time the filechooser was used. In that case, make sure
filechooser knows that it does not need to do its default "select $pwd
or $home" routine.

https://bugzilla.gnome.org/show_bug.cgi?id=766122

diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index fcd928662ad272886ece49274ba499f48683af0c..79a099eb35d14a32eb5d686ee1e581c2a1435f18 100644 (file)
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -5667,6 +5667,9 @@ gtk_file_chooser_widget_select_file (GtkFileChooser  *chooser,
       files.data = (gpointer) file;
       files.next = NULL;
 
+      /* Prevent the file chooser from loading a different folder when it is mapped */
+      priv->reload_state = RELOAD_HAS_FOLDER;
+
       result = show_and_select_files (impl, &files);
       g_object_unref (parent_file);
       return result;